fix(controller): Revert cb9676e88. Fixes #5852 #5933
+23
−5
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.